ChatGPT - Code review and fixes