conventions corrected!
code conventions merge