Adding some mathematical constants to cp
Refactoring some methods and minor changes