Cleanup, some documentation