Cleaned up files and names