Reduce badness of code