Just cleaning up for my sake.

Also Starting to Consolidate Javascript.