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