Cleanup
Cleanup & refactor schema methods