Refactored and shortened the code
Merge branch 'master' of https://github.com/drubio1989/Systemscheckpoints