Remove trailing whitespaces
Remove FIXMEs

Avoid using &mut self for now.