Removed print
Cleanup
Moved some more methods