Tidied up code

Tidied up some code. Many "else" statements are obsolete (clean code)