Cleanup comments
Add derivation/integration