cleaning up code
show merge