diff --git a/extra/manpage b/extra/manpage
index 23a63e1..fa36f8a 100755
--- a/extra/manpage
+++ b/extra/manpage
@@ -2,7 +2,9 @@
 .SH NAME
 sshyp \- A very simple self-hosted, synchronized password manager for UNIX(-like) systems. Alternative to (and compatible with) pass/password-store.
 .SH SYNOPSIS
-sshyp [OPTION] [[FLAG]] [/<entry name>]
+Client Usage: sshyp [option [flag] [<entry name>]] | [/<entry name>]
+
+Server Usage: sshyp [option [flag] [<device id>]]
 .SH DESCRIPTION
 sshyp is a lightweight password and note management program written in Python. sshyp is used via CLI and is self-hosted with a client-server model. sshyp expects that you have access to a personal server with a properly configured ssh server, ideally accepting remote connections.
 .SH EXAMPLES (CLIENT)
@@ -45,8 +47,6 @@ Adding a device with the id "laptop-YGuyGUY67F4gj8Hhs" to the quick-unlock white
 Removing a device with the id "laptop-YGuyGUY67F4gj8Hhs" from the quick-unlock whitelist:
     sshyp whitelist del laptop-YGuyGUY67F4gj8Hhs
 .SH OPTIONS (CLIENT)
-USAGE: sshyp [OPTION [FLAG] [<entry name>]] | [/<entry name>]
-
  help/--help/-h           bring up the help menu
  version/-v               display sshyp version info
  tweak                    configure sshyp
@@ -75,8 +75,6 @@ copy:
 gen:
  update/-u                generate a password for an existing entry
  .SH OPTIONS (SERVER)
-USAGE: sshyp [option [flag] [<device id>]]
-
  help/--help/-h           bring up this menu
  version/-v               display sshyp version info
  tweak                    configure sshyp