Further refactoring + fixes + code commenting

Code was refactored in order to facilitate adding the self post view functionality without having to duplicate code