Cleaned up the solution