Fixed most errors associated with refactoring