Some more edits to remove useless else's