Remove trailing spaces
Fix severe bug caused by buggy initializer