fix some indentation, flesh out sanitazion