refactored code style to reflect proper naming convention