Cleaned up output and debug