commenting a bit
clarifying a comment
extracting constants
moving an initialization to the right place
refactoring and test clean up