Fixing issue with class annotations.

Also fixed a recently introduced bug with detecting comments
Also made sure open braces after classes are aligned correctly