updating style and cleaning up