Removed error catch, fixed indenting