Fix core production code for RuboCop Warnings