HACKING - REFACTOR minor cleanup