Clean up; merge two methods.