Slightly cleaner internals