Cleanup

Removed echos used for testing, commented some stuff, general cleanup