Updates to style, naming, formatting