Formatting fixed and debugging output removed