Hockeyist style refactoring. Readme fix