Cleaned up Solution File