improved internal naming
minor simplification