Feature/style guide corrections

all changes for feature branch of the style-guide corrections. ready for test on rva-test server