Code clean #1