Refactoring : add log macro, optimize collectionViewCell