improving organization and documentation