-Bit of code refactor