Added missing references in parameters or return values
Started to optimize runtime. Reduced time for avg. classification to under 180ms