address pull request comments
address pull request comments

 Address comments by @stdweird in the PR
jouvin/aii,stdweird/aii,jrha/aii,jouvin/aii,alvarosimon/aii,stdweird/aii,jrha/aii,quattor/aii,alvarosimon/aii