Cleaned Up the code.