Formatting, removing unused variables.