Update comments and remove unnecessary conditional