Simplify a bit based on trustins feedback