map style updated, general cleanup
cleanup