style cleaning up