Style cleanup
Unused commented code removed.
debug code removed