- reformatted some code