Minor cleanup
More cleanup