Some much needed cleanup of my code