move elif block a bit