Style fix + debug