Fixed more duplicate code issues