Cleanup, added comments, updated README