cleaning things up based on new approach