Removed modernizer
style issues