Adresses #73 - Removed duplicate code.