Test update
Code clean and simplification