Some cleanup
More comments and cleanup