Refactored parameters + lint fixes
Fixed naming convention