Minor fixes/modification
Change code styles