simple outline
general cleanup