cleanup spacing/naming