-Quick Code refactor

- in queue