Fix comment indentation
Improve code for problem 2
Problem 3 solved