right user set on cotent & some refactorings