cleanup, renamed some parameters