Refactor for brevity, removing unnecessary empty function