refactoring things to follow conventions better
refactoring things to follow conventions better