Added whitespace highlight and updated structure.