Remove some style stuff enforced by Rubocop but new removed