Code cleanup
More cleanup