fixed formatting issues and removed repetitive implementation. Working on new implementation
fixed formatting issues and removed repetitive implementation. Working on new implementation

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp