improve coding style of /Grid Package