Add comments and tiny bit of cleanup