Removed also static keyword from variables