Clean up some stuff and added a bit more structure