Fix references to amount
Rename actuators
Refactor read_line