address #51

[dk]

and add minor style fixes

[coveralls]

Pull Request Test Coverage Report for Build 4628115441

• 0 of 0 changed or added relevant lines in 0 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 35.029%

---

Totals
Change from base Build 4356010069:	0.0%
Covered Lines:	854
Relevant Lines:	2438

---

💛 - Coveralls

[mohawk2]

Thank you!