Code clean and updated