Got rid of redundant self