simplified CriticalPoints class object and added doc strings