code cleanup
bouncer improved