new lines code
cleanup