Cleaned up comments and fixed form of data vector