Clean code and add new sample scenario