Code cleanup
Merge pull request #1729 from daftspunk/master

Minor code clean up