diff --git a/binding/form_mapping.go b/binding/form_mapping.go
index 1af8165e..34f12678 100644
--- a/binding/form_mapping.go
+++ b/binding/form_mapping.go
@@ -152,7 +152,7 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
 	if timeFormat == "" {
 		return errors.New("Blank time format")
 	}
-	
+
 	if val == "" {
 		value.Set(reflect.ValueOf(time.Time{}))
 		return nil
diff --git a/context.go b/context.go
index 971675d8..c5ff7937 100644
--- a/context.go
+++ b/context.go
@@ -87,7 +87,7 @@ func (c *Context) HandlerName() string {
 
 // Handler returns the main handler.
 func (c *Context) Handler() HandlerFunc {
-        return c.handlers.Last()
+	return c.handlers.Last()
 }
 
 /************************************/
diff --git a/context_test.go b/context_test.go
index 66a55cd2..e8cea05d 100644
--- a/context_test.go
+++ b/context_test.go
@@ -283,13 +283,12 @@ var handlerTest HandlerFunc = func(c *Context) {
 }
 
 func TestContextHandler(t *testing.T) {
-        c, _ := CreateTestContext(httptest.NewRecorder())
-        c.handlers = HandlersChain{func(c *Context) {}, handlerTest}
+	c, _ := CreateTestContext(httptest.NewRecorder())
+	c.handlers = HandlersChain{func(c *Context) {}, handlerTest}
 
-        assert.Equal(t, reflect.ValueOf(handlerTest).Pointer(), reflect.ValueOf(c.Handler()).Pointer())
+	assert.Equal(t, reflect.ValueOf(handlerTest).Pointer(), reflect.ValueOf(c.Handler()).Pointer())
 }
 
-
 func TestContextQuery(t *testing.T) {
 	c, _ := CreateTestContext(httptest.NewRecorder())
 	c.Request, _ = http.NewRequest("GET", "http://example.com/?foo=bar&page=10&id=", nil)