Fixed more code style issues