Generally cleaned the code up