Resolve Paul's last comment for his style of code