cleaning up solution, passing all specs :)