Fixed more style violations