- removed doubled code