Prettified some codes