Comments and styles clean-up