Removed main 'if/else' and minor updates