Reorganize a bit and fix spacing