bug fixing, cleaning