Rubocop style issues and better field management