Implementated enhancement #8
Adapting best practice conventions
Adapting best practice conventions