Added some more ;else lines to be consistent with your style