Fix whitespace
First try
Add moveWhile and moveUntil