Cleanup. Also basics for matrix class