More cleanup making it easier to read