Refactoring + Optimizing for usage with techdivision/naming package