Fix the default info that should be nil
Reorganise function more logically between module