Code clean up
Merge pull request #491 from seuros/cleanup

Code clean up