cleaned house and set up structure for actual code