removed commented code;
renamed one perameter to fit its purpose better;