Trim whitespace
Improve stop + jump to end