Minor amendments to debug output and code readability