Make some utility methods static and reusable