Big code clean