Yep even more code cleanup