Cleaned up solving code a bit