Simplification and comment adaptations