Refactoring and documenting some classes of GAndAR