Prettified code a bit