Light code refactor.