Removed $ sign and cleaned up debug code