Test update
Test update and some cleaning