Refcatoring cleaup
Cleanup