Improvment in code style