Fix code issues implementation