Refactoring, comments, documentation