Refactoring; removed duplicate method.