Code review
Added some public parameters