Simplify some more code