diff --git a/README.markdown b/README.markdown
index 894c195..c549a7b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,2 +1,5 @@
 vim-autoformat
-==============
\ No newline at end of file
+==============
+
+html, css, javascript by vim-jsbeautify
+python by autopep8
diff --git a/ftplugin/javascript.vim b/ftplugin/javascript.vim
index d0b0105..5a5c7ac 100644
--- a/ftplugin/javascript.vim
+++ b/ftplugin/javascript.vim
@@ -1,8 +1,7 @@
-let &formatexpr="JsBeautify()"
+let s:CliOptions = "-d"
 let s:bundleDir = fnamemodify(expand("<sfile>"), ":h:h:h")
-let g:jsbeautify_file = fnameescape(s:bundleDir."/js-beautify/beautify.js")
+let &formatprg=s:bundleDir."/js-beautify/python/js-beautify -i ".s:CliOptions
 
-let g:jsbeautify = {'indent_size': 4, 'indent_char': ' '}
 set expandtab
 set tabstop=4
 set shiftwidth=4
diff --git a/plugin/.autoformat.vim.swp b/plugin/.autoformat.vim.swp
deleted file mode 100644
index c74802a..0000000
Binary files a/plugin/.autoformat.vim.swp and /dev/null differ