Prettied up the code