Amend readme, tweak comments and class-naming