Add some code to deal with whitespace better