started cleaning up less
made more style and semantic changes