Fixing some more style issues and cleansiness issues.