improved logging
removed finalize method not required