fixing up to new working order
whitespace cleanup
Cleanup