Few stylistic improvements