[TASK] Add missing import of interface used in annotation
[TASK] Reverse order of static/public in method for cosmetics