Clean up

Add clean up
remove ceil in cmath