Code was cleaned