cleanup, comments added