changed all variables to objects

changed all variables to objects