removed unicode literals, general cleanup