Clean up last commit... will probably clean up more