Fixed more style issues