Adding log4Javascript
General cleanup