Maybe fixed #254
Clean up whitespace