Cleaned up some code and objects

Commit.