Split and rename methods to separate concerns