ContextRework: SIMPLIFICATION + COMMENTS + COSMETICS