Cleanup + some documentation