cleanup + add spacing constants