Optimized code
Merge branch 'master' of https://github.com/Swifta/PSAWebPortal.git