Fixed some style and minor coding issues per landscape.io