Formatting, getting rid of dead code