Fixing PSR2 §2.5 - cases mixed with comments