Updated code style. More on comments.