Minor code cleaning.
Started activemotif data parsing