Adding skeleton script; some cleanup