Cleaning up for Rubocop...not my mess thought :)