minor general cleanup