Refactory corrections