Reorganize utility methods