More cleanup
Code cleanup