Further Cleaned Up the Codes