Clean-up and making ENTRYPOINT preferred form...

Adding clean-up RUN, and making ENTRYPOINT the preferred form.