Add logging
General cleanup