Simplify and rename method for clarity