Small style fixes and code cleanup
More cleanup