Cleaned up decomposition plotting code