More documentation  + Cleanup