simplification
minor updates