Made code cleaner by indenting some lines