Cleaning minor things
More cleanup