Prettifying code and design a bit