more testing, better modularity in code.