Code cleanup
More doc cleanup