Cleaned up some code
Merge origin/master