diff --git a/README.md b/README.md
index b0ea610..b673fb5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ The shared library uses NIF. Use the erlang file `sec/nifecrecover.erl` to use t
 
 ```
 c("src/nifecrecover").
-Decoded = nifecrecover:hexstr_to_bin("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").
+ Decoded = nifecrecover:hexstr_to_bin("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad000000000000000000000000000000000000000000000000000000000000001b650acf9d3f5f0a2c799776a1254355d5f4061762a237396a99a0e0e3fc2bcd6729514a0dacb2e623ac4abd157cb18163ff942280db4d5caad66ddf941ba12e03").
 nifecrecover:ecrecover(Decoded).
 nifecrecover:time_taken_to_execute(fun() -> nifecrecover:ecrecover(Decoded) end).
 ```
\ No newline at end of file
diff --git a/src/ecrecover.app.src b/src/ecrecover.app.src
index 485cf60..11ea7e2 100644
--- a/src/ecrecover.app.src
+++ b/src/ecrecover.app.src
@@ -7,7 +7,6 @@
     stdlib,
     lager,
     enacl,
-    ecrecover,
     ecrecoverprebuilt
    ]},
   {env,[]},
diff --git a/src/ecrecover.erl b/src/ecrecover.erl
index e2e277f..cedf6ea 100644
--- a/src/ecrecover.erl
+++ b/src/ecrecover.erl
@@ -1,50 +1,70 @@
--module(ecrecover).
--export([start/1, stop/0, init/1]).
--export([ecrecover/1]).
--export([time_taken_to_execute/1]).
+-module(nifecrecover).
 
+%% API
+-export([ecrecover/1,
+	 ecrecover_hex/1,
+	 bin_to_hexstr/1,
+	 hexstr_to_bin/1,
+	 time_taken_to_execute/1
+]).
+
+%% Native library support
+-export([load/0]).
+-on_load(load/0).
+
+ecrecover(_Input) ->
+    not_loaded(?LINE).
+
+ecrecover_hex(Input) ->
+    Decoded = hexstr_to_bin(Input),
+    {ok, PubKey} = ecrecover(Decoded),
+    Encoded = bin_to_hexstr(PubKey),
+    Encoded.
+
+
+load() ->
+    erlang:display(file:get_cwd()),
+    Dir = case code:priv_dir(nifecrecover) of
+              {error, bad_name} ->
+                  filename:join(
+                    filename:dirname(
+                      filename:dirname(
+                        code:which(?MODULE))), "priv");
+              D -> D
+          end,
+    SoName = filename:join(Dir, atom_to_list(?MODULE)),
+    ok = erlang:load_nif(SoName, 0).
+
+not_loaded(Line) ->
+    erlang:nif_error({error, {not_loaded, [{module, ?MODULE}, {line, Line}]}}).
+
+priv()->
+  case code:priv_dir(?MODULE) of
+      {error, _} ->
+          EbinDir = filename:dirname(code:which(?MODULE)),
+          AppPath = filename:dirname(EbinDir),
+          filename:join(AppPath, "priv");
+      Path ->
+          Path
+  end.
+
+%%
 time_taken_to_execute(F) -> Start = os:timestamp(),
   F(),
   io:format("total time taken ~f seconds~n", [timer:now_diff(os:timestamp(), Start) / 1000000]).
 
-start(ExtPrg) ->
-    spawn(?MODULE, init, [ExtPrg]).
-stop() ->
-    ecrecover ! stop.
+%%
+bin_to_hexstr(Bin) ->
+  lists:flatten([io_lib:format("~2.16.0B", [X]) ||
+    X <- binary_to_list(Bin)]).
 
-ecrecover(X) ->
-    call_port({ecrecover, X}).
-
-call_port(Msg) ->
-    ecrecover ! {call, self(), Msg},
-    receive
-	{ecrecover, Result} ->
-	    Result
-    end.
-
-init(ExtPrg) ->
-    register(ecrecover, self()),
-    process_flag(trap_exit, true),
-    Port = open_port({spawn, ExtPrg}, [{packet, 2}]),
-    loop(Port).
-
-loop(Port) ->
-    receive
-	{call, Caller, Msg} ->
-	    Port ! {self(), {command, encode(Msg)}},
-	    receive
-		{Port, {data, Data}} ->
-		    Caller ! {ecrecover, Data}
-	    end,
-	    loop(Port);
-	stop ->
-	    Port ! {self(), close},
-	    receive
-		{Port, closed} ->
-		    exit(normal)
-	    end;
-	{'EXIT', Port, _} ->
-	    exit(port_terminated)
-    end.
-
-encode({_, X}) -> [1, X].
+hexstr_to_bin(S) ->
+  hexstr_to_bin(S, []).
+hexstr_to_bin([], Acc) ->
+  list_to_binary(lists:reverse(Acc));
+hexstr_to_bin([X,Y|T], Acc) ->
+  {ok, [V], []} = io_lib:fread("~16u", [X,Y]),
+  hexstr_to_bin(T, [V | Acc]);
+hexstr_to_bin([X|T], Acc) ->
+  {ok, [V], []} = io_lib:fread("~16u", lists:flatten([X,"0"])),
+  hexstr_to_bin(T, [V | Acc]).
diff --git a/src/nifecrecover.erl b/src/nifecrecover.erl
deleted file mode 100644
index cedf6ea..0000000
--- a/src/nifecrecover.erl
+++ /dev/null
@@ -1,70 +0,0 @@
--module(nifecrecover).
-
-%% API
--export([ecrecover/1,
-	 ecrecover_hex/1,
-	 bin_to_hexstr/1,
-	 hexstr_to_bin/1,
-	 time_taken_to_execute/1
-]).
-
-%% Native library support
--export([load/0]).
--on_load(load/0).
-
-ecrecover(_Input) ->
-    not_loaded(?LINE).
-
-ecrecover_hex(Input) ->
-    Decoded = hexstr_to_bin(Input),
-    {ok, PubKey} = ecrecover(Decoded),
-    Encoded = bin_to_hexstr(PubKey),
-    Encoded.
-
-
-load() ->
-    erlang:display(file:get_cwd()),
-    Dir = case code:priv_dir(nifecrecover) of
-              {error, bad_name} ->
-                  filename:join(
-                    filename:dirname(
-                      filename:dirname(
-                        code:which(?MODULE))), "priv");
-              D -> D
-          end,
-    SoName = filename:join(Dir, atom_to_list(?MODULE)),
-    ok = erlang:load_nif(SoName, 0).
-
-not_loaded(Line) ->
-    erlang:nif_error({error, {not_loaded, [{module, ?MODULE}, {line, Line}]}}).
-
-priv()->
-  case code:priv_dir(?MODULE) of
-      {error, _} ->
-          EbinDir = filename:dirname(code:which(?MODULE)),
-          AppPath = filename:dirname(EbinDir),
-          filename:join(AppPath, "priv");
-      Path ->
-          Path
-  end.
-
-%%
-time_taken_to_execute(F) -> Start = os:timestamp(),
-  F(),
-  io:format("total time taken ~f seconds~n", [timer:now_diff(os:timestamp(), Start) / 1000000]).
-
-%%
-bin_to_hexstr(Bin) ->
-  lists:flatten([io_lib:format("~2.16.0B", [X]) ||
-    X <- binary_to_list(Bin)]).
-
-hexstr_to_bin(S) ->
-  hexstr_to_bin(S, []).
-hexstr_to_bin([], Acc) ->
-  list_to_binary(lists:reverse(Acc));
-hexstr_to_bin([X,Y|T], Acc) ->
-  {ok, [V], []} = io_lib:fread("~16u", [X,Y]),
-  hexstr_to_bin(T, [V | Acc]);
-hexstr_to_bin([X|T], Acc) ->
-  {ok, [V], []} = io_lib:fread("~16u", lists:flatten([X,"0"])),
-  hexstr_to_bin(T, [V | Acc]).