Cleaning up, documentation started