Clean up with fmt.Errorf
Merge pull request #6 from jingweno/clean_up_errorf

Clean up code a bit with fmt.Errorf