Cleaned up initial solution