Pull request - 08-25-2014

First code review
Prefer `map` over `collect`.<br>Inconsistent indentation detected.