Some refactoring
cleanup
Renames