Revert "Code clean"

This reverts commit b8bec3327dc520ff868df15d116b8ee39376943e.