Fix stylistic problems