Retab Enums file
Some psr fixs in Data
Extracted some useful functions in functions file