diff --git a/Cargo.toml b/Cargo.toml
index 1dabdd58f5..2b8f9daffc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,7 @@ ring = "0.16"
 lazy_static = "1"
 
 [target."cfg(windows)".dependencies]
-winapi = {version = "0.3", features = ["wincrypt"] }
+winapi = { version = "0.3", features = ["wincrypt"] }
 
 [dev-dependencies]
 mio = "0.6"
diff --git a/src/build.rs b/src/build.rs
index be98684efb..68b0b837a2 100644
--- a/src/build.rs
+++ b/src/build.rs
@@ -1,5 +1,3 @@
-use cmake;
-
 // Additional parameters for Android build of BoringSSL.
 const CMAKE_PARAMS_ANDROID: &[(&str, &[(&str, &str)])] = &[
     ("aarch64", &[
@@ -55,12 +53,12 @@ const CMAKE_PARAMS_IOS: &[(&str, &[(&str, &str)])] = &[
     ]),
 ];
 
-/// Generate the platform-specific output path for lib
+/// Returns the platform-specific output path for lib.
 ///
 /// MSVC generator on Windows place static libs in a target sub-folder,
 /// so adjust library location based on platform and build target.
 /// See issue: https://github.com/alexcrichton/cmake-rs/issues/18
-fn platform_output_path(lib: &str) -> String {
+fn get_boringssl_platform_output_path(lib: &str) -> String {
     if cfg!(windows) {
         if cfg!(debug_assertions) {
             return format!("{}/Debug", lib);
@@ -72,9 +70,9 @@ fn platform_output_path(lib: &str) -> String {
     };
 }
 
-// Returns a new cmake::Config for building BoringSSL.
-//
-// It will add platform-specific parameters if needed.
+/// Returns a new cmake::Config for building BoringSSL.
+///
+/// It will add platform-specific parameters if needed.
 fn get_boringssl_cmake_config() -> cmake::Config {
     let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
     let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
@@ -126,20 +124,19 @@ fn main() {
     if !cfg!(feature = "no_bssl") {
         let bssl_dir = std::env::var("QUICHE_BSSL_PATH").unwrap_or_else(|_| {
             get_boringssl_cmake_config()
-                .cflag("-fPIC")
                 .build_target("bssl")
                 .build()
                 .display()
                 .to_string()
         });
 
-        let crypto_dir =
-            format!("{}/build/{}", bssl_dir, platform_output_path("crypto"));
+        let crypto_path = get_boringssl_platform_output_path("crypto");
+        let crypto_dir = format!("{}/build/{}", bssl_dir, crypto_path);
         println!("cargo:rustc-link-search=native={}", crypto_dir);
         println!("cargo:rustc-link-lib=static=crypto");
 
-        let ssl_dir =
-            format!("{}/build/{}", bssl_dir, platform_output_path("ssl"));
+        let ssl_path = get_boringssl_platform_output_path("ssl");
+        let ssl_dir = format!("{}/build/{}", bssl_dir, ssl_path);
         println!("cargo:rustc-link-search=native={}", ssl_dir);
         println!("cargo:rustc-link-lib=static=ssl");
     }