Improve method naming and logic flow