Cleaned up Solution.