Made some name changes and moved/removed some code