Indentation

 * Indentation fixes
 * All `else` blocks are on new lines
 * All `catch` blocks are on new lines