Minor update
cleanup & method updated