Merge "Minor code clean up in SpecialBooksources"