Simplify static methods
Only use fully qualified class names in class declaration