Much prettier
Problem #2
cleanup problem 2, solve problem 3