Cleaned up and added main class to make running jobs simple