HACKING - REFACTORING minor stuff
HACKING - REFACTORING minor stuff