Added extra logging and visual cleanup