code cleanup

formatting, some slight changes since I'm using D
code cleanup

don't know why I didn't do it this way before.
consistent spacing