Changed execution style; variables simplified