changing style and cleaning up stuff