Clean up code and add comment
Merge branch 'master' of https://github.com/rich-iannone/stationaRy