NOJIRA More refactoring..