Working on keeping a standard across all the code