Updated to remove whitespace and tabs