Cleaned up comment format