Fixed these stupid function expressions/function declaratiosn