Cleaned up in files