Made functions strict