Minor modifs

Some additional modifications for clarity only