Cleaned formatting, added solutions