Code Retidying and CustomList added.