remove little ugly code