 	}
 }
 
-int increase(int color)
-{
-	if(currentMode != previousMode) { 
+void increase(int color) {
+
+	if(currentMode != previousMode) {
 		setColor(color);
 		currentBrightness = maxBrightness;
 		increaseLength = 1;
-		previousMode = currentMode; 
-	}
-
-	if(millis() > timer + increaseInterval && increaseDirection)
-	{
-		for(int a=0; a <= numPixels; a++) { strip.setPixelColor(a, 0, 0, 0); }
-		for(int a=0; a < increaseLength; a++) { 
-			strip.setPixelColor(a, color1, color2, color3); 
+		previousMode = currentMode;
+	}
+
+	if(millis() > timer + increaseInterval && increaseDirection) {
+		for(int a=0; a < numPixels; a++) { strip.setPixelColor(a, 0, 0, 0); }
+
+		for(int a=0; a < increaseLength; a++) {
+			strip.setPixelColor(a, color1, color2, color3);
 		}
 
 		increaseLength++;
-		if(increaseLength >= numPixels) { 
-			increaseLength = 1; 
+		if(increaseLength >= numPixels) {
+			increaseLength = 1;
 			increaseDirection = !increaseDirection;
 		}
 


Adafruit_NeoPixel strip = Adafruit_NeoPixel(numPixels, pixelPin, NEO_GRB + NEO_KHZ800);

void readSensors()
{
	sw1Read = digitalRead(sw1Pin);
	sw2Read = digitalRead(sw2Pin);

	if( !sw1Read && !sw2Read )	{ currentMode = 1; }
	if( sw1Read && !sw2Read )	{ currentMode = 2; }
	if( !sw1Read && sw2Read )	{ currentMode = 3; }
	if( sw1Read && sw2Read )	{ currentMode = 4; }
}

int setColor(int color)
{
	if(color == rnd) { 
		color1 = random(1,255);
		color2 = random(1,255);
		color3 = random(1,255);

		if((color1 + color2 + color3) < minColorIntensity) { setColor(rnd); }
	}

	if(color == off) { color1 = 0; color2 = 0; color3 = 0; }
	if(color == white) { color1 = 255; color2 = 255; color3 = 255; }
	if(color == warmwhite) { color1 = 255; color2 = 147; color3 = 41; }
	if(color == red) { color1 = 255; color2 = 0; color3 = 0; }
	if(color == green) { color1 = 0; color2 = 255; color3 = 0; }
	if(color == blue) { color1 = 0; color2 = 0; color3 = 255; }
	if(color == yellow) { color1 = 255; color2 = 255; color3 = 0; }
	if(color == orange) { color1 = 255; color2 = 128; color3 = 0; }
}

int setAll(int color, int brightness)
{
	if(currentMode != previousMode) {
		setColor(color);
		for(int a = 0; a <= numPixels; a++) {
			strip.setPixelColor(a, color1, color2, color3);	
		}
		strip.setBrightness(brightness);
		strip.show();

	}
}

void worm(int color) {

	if(currentMode != previousMode) { setColor(color); previousMode = currentMode; }

	if(millis() > timer + wormInterval) {

		for(int a=0; a < numPixels; a++) { strip.setPixelColor(a,0,0,0); }
		for(int b=wormStartPixel; b < wormStartPixel + wormLength; b++) {
			if(b >= numPixels) ledNumber = b - numPixels;
			else ledNumber = b;

			strip.setPixelColor(ledNumber, color1, color2, color3);
		}

