made the code have a more consistant style