Code refactor...