Revised code style changes