diff --git a/usr/bin/remount-secure b/usr/bin/remount-secure
index d282ad5..540a9ce 100755
--- a/usr/bin/remount-secure
+++ b/usr/bin/remount-secure
@@ -225,32 +225,31 @@ end() {
 
 ## TODO: need to be tested one by one
 main() {
-   init "$@"
+   init
    parse_options "$@"
-   _boot "$@"
-
-   _run "$@"
+   _boot
+   _run
 
    ## TODO: ?
-   #_dev "$@"
+   #_dev
 
-   _dev_shm "$@"
-   _tmp "$@"
+   _dev_shm
+   _tmp
 
    ## TODO: ?
-   #_var "$@"
+   #_var
 
-   _var_tmp "$@"
+   _var_tmp
 
    ## TODO: ?
    #_var_log
    #_var_log_audit
 
    ## TODO: broken?
-   #_lib "$@"
+   #_lib
 
-   _home "$@"
-   end "$@"
+   _home
+   end
 }
 
 main "$@"