Moved static method into own class