Added another debugging function back, whitespace changes