Fix white space and tab issues