Prettying up code