Add comments and start cleaning up