Chnages to code style