Rearrangement and additional documentation