Tidied up code

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