Ft/clean points

@m0hamed 
@sshihata 
Please review