moved elements, cleaned up old comments
Merge pull request #10 from wri/feature/cleaning

moved elements, cleaned up old comments