Cleaned up solutions