Clean more code