Cleaned up files, imports, strings