Fix whitespace and 'redundant self'