organizing code; refactoring; optimizations