trying to clean things up...