Code Cleaned Up.