Re-formatting code - should go quick, there will be some copy and pasting