Style tweaks and remove debug log.