Normalazing code...
Database code normalized...
going to refactor application.ts code...