Clean up unnessary self and fix doc