Some cleanup, comments