Clean up piston logic
Clean up comments