removed commented lines and adjusted width