Bug resolution and some refactoring

Removal of Ready method in GM