Code formatting fixes
Some more changes