improve if/else -statements!