Small improve of implementation code