rm trailing spaces and fix #1