Properly use Grip module
Coding style + remove obsolete code