diff --git a/cmd/hydroxide/hydroxide.go b/cmd/hydroxide/hydroxide.go
index afbe5d9..82ab25b 100644
--- a/cmd/hydroxide/hydroxide.go
+++ b/cmd/hydroxide/hydroxide.go
@@ -11,9 +11,9 @@ import (
 
 func main() {
 	c := &protonmail.Client{
-		RootURL: "https://dev.protonmail.com/api",
-		AppVersion: "Web_3.11.1",
-		ClientID: "Web",
+		RootURL:      "https://dev.protonmail.com/api",
+		AppVersion:   "Web_3.11.1",
+		ClientID:     "Web",
 		ClientSecret: "4957cc9a2e0a2a49d02475c9d013478d",
 	}
 
diff --git a/protonmail/auth.go b/protonmail/auth.go
index 8692d19..1613509 100644
--- a/protonmail/auth.go
+++ b/protonmail/auth.go
@@ -8,28 +8,28 @@ import (
 )
 
 type authInfoReq struct {
-	ClientID string
+	ClientID     string
 	ClientSecret string
-	Username string
+	Username     string
 }
 
 type AuthInfo struct {
-	TwoFactor int
-	version int
-	modulus string
+	TwoFactor       int
+	version         int
+	modulus         string
 	serverEphemeral string
-	salt string
-	srpSession string
+	salt            string
+	srpSession      string
 }
 
 type AuthInfoResp struct {
 	resp
 	AuthInfo
-	Version int
-	Modulus string
+	Version         int
+	Modulus         string
 	ServerEphemeral string
-	Salt string
-	SRPSession string
+	Salt            string
+	SRPSession      string
 }
 
 func (resp *AuthInfoResp) authInfo() *AuthInfo {
@@ -44,9 +44,9 @@ func (resp *AuthInfoResp) authInfo() *AuthInfo {
 
 func (c *Client) AuthInfo(username string) (*AuthInfo, error) {
 	reqData := &authInfoReq{
-		ClientID: c.ClientID,
+		ClientID:     c.ClientID,
 		ClientSecret: c.ClientSecret,
-		Username: username,
+		Username:     username,
 	}
 
 	req, err := c.newJSONRequest(http.MethodPost, "/auth/info", reqData)
@@ -63,42 +63,42 @@ func (c *Client) AuthInfo(username string) (*AuthInfo, error) {
 }
 
 type authReq struct {
-	ClientID string
-	ClientSecret string
-	Username string
-	SRPSession string
+	ClientID        string
+	ClientSecret    string
+	Username        string
+	SRPSession      string
 	ClientEphemeral string
-	ClientProof string
-	TwoFactorCode string
+	ClientProof     string
+	TwoFactorCode   string
 }
 
 type PasswordMode int
 
 const (
 	PasswordSingle PasswordMode = 1
-	PasswordTwo = 2
+	PasswordTwo                 = 2
 )
 
 type Auth struct {
-	AccessToken string
-	ExpiresIn int
-	TokenType string
-	Scope string
-	UID string `json:"Uid"`
+	AccessToken  string
+	ExpiresIn    int
+	TokenType    string
+	Scope        string
+	UID          string `json:"Uid"`
 	RefreshToken string
-	EventID string
+	EventID      string
 	PasswordMode PasswordMode
 
 	privateKey string
-	keySalt string
+	keySalt    string
 }
 
 type authResp struct {
 	resp
 	Auth
 	ServerProof string
-	PrivateKey string
-	KeySalt string
+	PrivateKey  string
+	KeySalt     string
 }
 
 func (resp *authResp) auth() *Auth {
@@ -116,21 +116,19 @@ func (c *Client) Auth(username, password, twoFactorCode string, info *AuthInfo)
 		}
 	}
 
-	log.Printf("%#v\n", info)
-
 	proofs, err := srp([]byte(password), info)
 	if err != nil {
 		return nil, err
 	}
 
 	reqData := &authReq{
-		ClientID: c.ClientID,
-		ClientSecret: c.ClientSecret,
-		Username: username,
-		SRPSession: info.srpSession,
+		ClientID:        c.ClientID,
+		ClientSecret:    c.ClientSecret,
+		Username:        username,
+		SRPSession:      info.srpSession,
 		ClientEphemeral: base64.StdEncoding.EncodeToString(proofs.clientEphemeral),
-		ClientProof: base64.StdEncoding.EncodeToString(proofs.clientProof),
-		TwoFactorCode: twoFactorCode,
+		ClientProof:     base64.StdEncoding.EncodeToString(proofs.clientProof),
+		TwoFactorCode:   twoFactorCode,
 	}
 
 	req, err := c.newJSONRequest(http.MethodPost, "/auth", reqData)
diff --git a/protonmail/protonmail.go b/protonmail/protonmail.go
index e355075..9bb8c84 100644
--- a/protonmail/protonmail.go
+++ b/protonmail/protonmail.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 )
 
-const Version = 2
+const Version = 3
 
 const headerAPIVersion = "X-Pm-Apiversion"
 
@@ -39,15 +39,17 @@ func (err apiError) Error() string {
 
 // Client is a ProtonMail API client.
 type Client struct {
-	HTTPClient *http.Client
-	RootURL string
+	RootURL    string
 	AppVersion string
-	ClientID string
+
+	ClientID     string
 	ClientSecret string
+
+	HTTPClient *http.Client
 }
 
 func (c *Client) newRequest(method, path string, body io.Reader) (*http.Request, error) {
-	req, err := http.NewRequest(method, c.RootURL + path, body)
+	req, err := http.NewRequest(method, c.RootURL+path, body)
 	if err != nil {
 		return nil, err
 	}
diff --git a/protonmail/srp.go b/protonmail/srp.go
index 6bd9d29..74f106d 100644
--- a/protonmail/srp.go
+++ b/protonmail/srp.go
@@ -41,7 +41,7 @@ func reverse(b []byte) {
 func itoa(i *big.Int, l int) []byte {
 	b := i.Bytes()
 	reverse(b)
-	padding := make([]byte, l/8 - len(b))
+	padding := make([]byte, l/8-len(b))
 	b = append(b, padding...)
 	return b
 }
@@ -52,8 +52,8 @@ func atoi(b []byte) *big.Int {
 }
 
 type proofs struct {
-	clientEphemeral []byte
-	clientProof []byte
+	clientEphemeral     []byte
+	clientProof         []byte
 	expectedServerProof []byte
 }
 
@@ -129,8 +129,8 @@ func generateProofs(l int, hash func([]byte) []byte, modulusBytes, hashedBytes,
 	serverProof = hash(serverProof)
 
 	return &proofs{
-		clientEphemeral: itoa(clientEphemeral, l),
-		clientProof: clientProof,
+		clientEphemeral:     itoa(clientEphemeral, l),
+		clientProof:         clientProof,
 		expectedServerProof: serverProof,
 	}, nil
 }