cleaning it up, taking out the hacky wackiness