Better arranged functions