public static
Refactoring
Tests ongoing