Code cleanup, comments