Cleanup, added comments