Code optimize

- Used single quotes
- Reduce unnecessary use of self