Update
Code cleanup