cleanup
Move single variables or numbers