Cosmetical refactoring
Document, comment and refactor slightly