Add comment, adjust code a little