Cleaned up a bit more code
Merge origin/master