cleaned up code
Merge origin/master