Updates to structure to bring in line with style guide; added normalize