Clean up!

first commit after clean up!