Mostly prettying up the code