Working on refactoring, I think I can make more enhancements to the code.