Stopped using eval, because eval is evil
Added missing semicolons