cleaning up code and update metadata