diff --git a/lua/autocmds.lua b/lua/autocmds.lua
index 359ca66..4441261 100644
--- a/lua/autocmds.lua
+++ b/lua/autocmds.lua
@@ -27,7 +27,7 @@ vim.api.nvim_create_autocmd('BufRead', {
 vim.api.nvim_create_autocmd('TermOpen', {
   group = group, pattern = 'term://*',
   callback = function()
-    vim.cmd [[ startinsert ]]
+    vim.cmd.startinsert()
   end
 })
 
diff --git a/lua/build.lua b/lua/build.lua
index 286d837..a382693 100644
--- a/lua/build.lua
+++ b/lua/build.lua
@@ -32,7 +32,7 @@ function build.set_dir(dirname)
       -- Restart clangd language server
       -- TODO: Configure cmake language server?
       on_exit = function()
-        vim.cmd [[ LspRestart clangd ]]
+        vim.cmd.LspRestart('clangd')
         echo('Build directory selected: ' .. dirname, 'DiagnosticInfo')
       end,
 
diff --git a/lua/mappings.lua b/lua/mappings.lua
index 418cd6d..f225e9c 100644
--- a/lua/mappings.lua
+++ b/lua/mappings.lua
@@ -29,7 +29,7 @@ vim.keymap.set('', '<leader>p', '"+p', { remap = false })
 vim.keymap.set('', '<leader>P', '"+P', { remap = false })
 
 -- Undo neovim's default mapping of Y to y$
-vim.cmd('unmap Y')
+vim.cmd.unmap('Y')
 
 -- Make nvim :terminal more like vim :terminal
 vim.keymap.set('t', '<C-w>N', '<C-\\><C-n>', { remap = true })
diff --git a/lua/plugins/utilities.lua b/lua/plugins/utilities.lua
index 6198843..48e045f 100644
--- a/lua/plugins/utilities.lua
+++ b/lua/plugins/utilities.lua
@@ -25,8 +25,8 @@ local noice = {
     })
 
     -- Override highlight groups
-    vim.cmd [[ highlight NoiceCmdlinePopupBorder guibg=#080808 ]]
-    vim.cmd [[ highlight link NoiceCmdlinePopupBorder NoiceCmdlinePopupBorderSearch ]]
+    vim.cmd.highlight('NoiceCmdlinePopupBorder', 'guibg=#080808')
+    vim.cmd.highlight('link', 'NoiceCmdlinePopupBorder', 'NoiceCmdlinePopupBorderSearch')
   end
 }
 
diff --git a/lua/statusline.lua b/lua/statusline.lua
index 25b3cfa..8366f02 100644
--- a/lua/statusline.lua
+++ b/lua/statusline.lua
@@ -27,12 +27,11 @@ modes[116]  = { name = 'Terminal', color = 'light_blue' }
 modes[33]   = { name = 'Shell', color = 'light_grey' }
 
 local function highlight(group, color, attrs)
-  local command = 'highlight ' .. group ..
-      ' guifg=' .. color.fg .. ' guibg=' .. color.bg
+  local args = { group, 'guifg=' .. color.fg, 'guibg=' .. color.bg }
   if attrs then
-    command = command .. ' gui=' .. attrs
+    table.insert(args, 'gui=' .. attrs)
   end
-  vim.cmd(command)
+  vim.cmd.highlight(args)
 end
 
 -- StatusLineLight is shows the mode and cursor information, it is dynamically
@@ -170,7 +169,7 @@ vim.api.nvim_create_autocmd({ 'BufEnter', 'WinEnter', 'BufWinEnter' }, {
   pattern = '*',
   group = group,
   callback = function()
-    vim.cmd [[ setlocal statusline=%{%v:lua.require('statusline').active()%} ]]
+    vim.cmd.setlocal("statusline=%{%v:lua.require('statusline').active()%}")
   end
 })
 
@@ -179,7 +178,7 @@ vim.api.nvim_create_autocmd({ 'BufLeave', 'WinLeave' }, {
   pattern = '*',
   group = group,
   callback = function()
-    vim.cmd [[ setlocal statusline=%{%v:lua.require('statusline').inactive()%} ]]
+    vim.cmd.setlocal("statusline=%{%v:lua.require('statusline').inactive()%}")
   end
 })