Added some extra best pratices