Fixed formatting and switch statement warnings