Clean up the code i messed up