Small refactoring
Fully documented all issues