cleanup, extension of features