cleaning a few things...