Method Clean-up

(Neven's changes)