Minor updates - added a comment and fixed a generics cast warning