Refactored solutions

Redirect to: