Remove duplicate code. Thanks Johann