[#35] CS fixes (trailing whitespace)