More Cleaning

yeah. it is dirty code.