Cleanup + More Documentation