Changes to Reflect

Remove final on fields that aren't static