Cleaned up debugging