don't use with(), fix indentation
clean up