Style cleanup

Cleaning up some styling issues. I need to go back and not just catch (Exception e) as well.