cleaned up code - lauren