Employ Best Practice

[TODO]