Simplification and documentations.