HACKING - minor refactoring