improved LOC a bit