Cleaned Up Files and Code