Made some additional cleanup