Styles updated to add more whitespace and comments