Removed suppress static and changed sort order