Address code style issues