Made some cleanup