Wrap up and clean your code

Clean your code and base table(s) to make it more accessible.