Cleaning up unused and unneeded  inits
Add language constants. PSR2 clean ups
PSR2 Cleanups