Cleaned up scripts, trimmed code.
Cleaned code up.