Organized the analysis script a little better...