code cleaning and minor refactoring
I'm not sure what have we decided to do with the comments
with author so I left them there for now.
merge
changed method name for retrieving logged user
sounded wierd to me