diff --git a/bin/pastebinner b/bin/pastebinner
index 9f0f1d1..89c0741 100755
--- a/bin/pastebinner
+++ b/bin/pastebinner
@@ -25,8 +25,8 @@ OptionParser.new do |parser|
     puts parser
     exit
   end
-  parser.on('-sp', '--scrape_public', "Scrape public pastes") do |sp|
-    opts[:sp] = true
+  parser.on('-s', '--scrape_public', "Scrape public pastes") do |s|
+    opts[:s] = true
   end
   parser.on('-r', '--raw', "Raw paste. Requires --key passed with a valid key") do |r|
     opts[:r] = true
@@ -34,8 +34,8 @@ OptionParser.new do |parser|
   parser.on('-k', '--key=', "Unique paste key") do |k|
     opts[:k] = k
   end
-  parser.on('-gk', '--get_keys', "Get unique paste keys from public pastes") do |gk|
-    opts[:gk] = true
+  parser.on('-g', '--get_keys', "Get unique paste keys from public pastes") do |g|
+    opts[:g] = true
   end
   parser.on('-d', '--download', 'Download all public pastes to data directory.') do |d|
     opts[:d] = true
@@ -46,14 +46,14 @@ OptionParser.new do |parser|
 
 end.parse!
 
-if opts[:sp]
+if opts[:s]
   puts pb.scrape_public_pastes
 elsif opts[:r] and opts[:k]
   key = opts[:k]
   puts pb.raw_paste_data(key)
 elsif opts[:t]
   puts pb.list_trending_pastes
-elsif opts[:gk]
+elsif opts[:g]
   r = pb.scrape_public_pastes
   puts pb.get_unique_paste_keys(r)
 elsif opts[:d]