Fixed issues with spaces and tabs