I hate code cleanup sometimes