Refactor code to be like other projects