- refactoring & putting comments