Improving documentation, cleanup