Comments and general cleaning