Warnings reduction - making proper fields static