Minor changes/cleanup

Cleaned up comment blocks for consistency as well