Round floating points and clean up
Update todo