Homogenize code with other starter kits