More comments / refactoring