Move stuff, fix strip whitespace