Fixed stylistic bugs