made code politically correct