Minor clean up on code style