towards cleaner internals..