Major cleanups + refactoring
Latest