Code Cleanup, Prep for Dynamic SQL