Removing unnecessary else and return statements

Guys, 

I know that this is a really minor change, but I think that is good to keep code style consistency, remove some unnecessary "elses" and stuff, so I came up with this - very little - Pull Request. I'm sending it to the stable branch because is just some code style adjustments. Please let me know if it suits your need or if I'm missing something. Thank you !