Style edits and debug