Small refactoring, comments added