Code cleaning

Remove lines
Remove unnecessary `else`