Cleanup+documentation
Refactor