Refactoring, got rid of staticness