Clean up and some commenting