cleaneup a little