Style refactoring of collections and helpers
Partial style refactoring of software block