Fixed formatting, moved redundant lines.