cleaned up 1-6

updated to python 3
did problem 25 renamed 18 and 16