Changing to adhere to code standard