Cleaned up dictionary decomposition