Better name, remove unnecessary code