Fixes jamierumbelow/codeigniter-base-model#172 and jamierumbelow/codeigniter-base-model#173

Code cleanup