minor refactoring, values tweaking