Removed duplicated methods, fixed a typing mistake.