Adds comments. Small refactoring.