code formatting and naming refactor