Removed '.' from variable names