Tweaked spacing, naming