Local changes
style optimization