Further refactoring cleanup and preperation of Controller port.