Commented and add whitespace throughout