refactor formatting and naming