improve organization with new objects