simplification
small updates