getting the code to look more uniform