Refactory Finish