Modularized + cleaned up scripts