Refactor: Major Internals cleanup