Cleanup, comments added