Cleanup, added comments, added timer