Some refactoring for using Best Practices