minor style modified!!!