beautified and valid
cleanup