Cleaning & added notation for matrices and vectors.