Updated formatting/whitespace based on comments