improved method naming and cleanup