Cleaned up the PCA class so it's easier to add/change