Refactoring: removed unnecessary blank lines, clarified names of internal methods and properties