Added two more problems and cleaned code