Fixed Problem and Cleaned Up Files