Some Code Refature