Ft/clean points

@m0hamed 
@sshihata 
Please review 
This is the way the Dr. does it in his code