Housekeeping

Cleaned the code from the Trikoder;
Made some adjustments to models;
Still work in progress