Some code beautyfiing