Cleaned up extraneous comments, spacing tweaks