Removed some type-casting