Style Clean

We cleaned some code code and fixed smaller style issues.