move methods from commands to helpers
reword exceptions