Cleaned Up the code, formating mostly.