Formatting, removing dead code