cleaning up code
simple merge