Some cleanup. Trying to separate commands.