Cleanup + refactor / moar docs