moved companion object to bottom
style adjustments: spacing
style: spaces in map and filter calls
style: adjusting for comprehension
refactoring solve, primarily for style