Improved comments fix

Simplified stuff from this #20