removeLine model
cleaning up comments
calcualteTotal model
refactor random, id into inline expression