Minor spacing changes, still needs fine tuning