Major Cleanup checkout the link...