fix formatting
merging refactor
fix formatting