code clean up
Merge pull request #52 from mellema/dev-three

code clean up