Debugged and cleaned up types