Fix style and debug