Fixed some rubocop offences
Removed some redundant self
space around default value assignment