Cleanup, comments, tweaks