Cleanup, add comments