Style fix.
Fixing refactoring bug.
Style fixes and removal of unneeded code.
More cleanup.