diff --git a/frontend/apps/opdscatalog/opdscatalog.lua b/frontend/apps/opdscatalog/opdscatalog.lua
index 38bf21921..9ef721cc9 100644
--- a/frontend/apps/opdscatalog/opdscatalog.lua
+++ b/frontend/apps/opdscatalog/opdscatalog.lua
@@ -1,14 +1,15 @@
-local InputContainer = require("ui/widget/container/inputcontainer")
+local Blitbuffer = require("ffi/blitbuffer")
+local ConfirmBox = require("ui/widget/confirmbox")
 local FrameContainer = require("ui/widget/container/framecontainer")
+local InputContainer = require("ui/widget/container/inputcontainer")
 local OPDSBrowser = require("ui/widget/opdsbrowser")
+local ReaderUI = require("apps/reader/readerui")
 local UIManager = require("ui/uimanager")
-local Screen = require("device").screen
 local logger = require("logger")
 local _ = require("gettext")
-local Blitbuffer = require("ffi/blitbuffer")
-local ReaderUI = require("apps/reader/readerui")
-local ConfirmBox = require("ui/widget/confirmbox")
+local Screen = require("device").screen
 local T = require("ffi/util").template
+
 local OPDSCatalog = InputContainer:extend{
     title = _("OPDS Catalog"),
     onExit = function() end,
diff --git a/frontend/cache.lua b/frontend/cache.lua
index f648a2df6..001df5e8b 100644
--- a/frontend/cache.lua
+++ b/frontend/cache.lua
@@ -1,10 +1,11 @@
 --[[
 A global LRU cache
 ]]--
-local md5 = require("ffi/MD5")
-local lfs = require("libs/libkoreader-lfs")
+
 local DataStorage = require("datastorage")
+local lfs = require("libs/libkoreader-lfs")
 local logger = require("logger")
+local md5 = require("ffi/MD5")
 
 if require("device"):isAndroid() then
     require("jit").off(true, true)
diff --git a/frontend/ui/language.lua b/frontend/ui/language.lua
index 042db9a3f..431d04417 100644
--- a/frontend/ui/language.lua
+++ b/frontend/ui/language.lua
@@ -1,7 +1,7 @@
 -- high level wrapper module for gettext
 
-local UIManager = require("ui/uimanager")
 local InfoMessage = require("ui/widget/infomessage")
+local UIManager = require("ui/uimanager")
 local _ = require("gettext")
 
 local Language = {}
diff --git a/frontend/ui/network/manager.lua b/frontend/ui/network/manager.lua
index d5bef5bb0..1ee9b1b70 100644
--- a/frontend/ui/network/manager.lua
+++ b/frontend/ui/network/manager.lua
@@ -1,12 +1,11 @@
-local InfoMessage = require("ui/widget/infomessage")
 local ConfirmBox = require("ui/widget/confirmbox")
-local UIManager = require("ui/uimanager")
-local LuaSettings = require("luasettings")
 local DataStorage = require("datastorage")
 local Device = require("device")
-local T = require("ffi/util").template
+local InfoMessage = require("ui/widget/infomessage")
+local LuaSettings = require("luasettings")
+local UIManager = require("ui/uimanager")
 local _ = require("gettext")
-
+local T = require("ffi/util").template
 
 local NetworkMgr = {}
 
diff --git a/frontend/ui/network/wpa_supplicant.lua b/frontend/ui/network/wpa_supplicant.lua
index bb17823c4..1c7e64308 100644
--- a/frontend/ui/network/wpa_supplicant.lua
+++ b/frontend/ui/network/wpa_supplicant.lua
@@ -1,9 +1,9 @@
-local UIManager = require("ui/uimanager")
-local WpaClient = require('lj-wpaclient/wpaclient')
 local InfoMessage = require("ui/widget/infomessage")
-local sleep = require("ffi/util").sleep
-local T = require("ffi/util").template
+local WpaClient = require('lj-wpaclient/wpaclient')
+local UIManager = require("ui/uimanager")
 local _ = require("gettext")
+local T = require("ffi/util").template
+local sleep = require("ffi/util").sleep
 
 local CLIENT_INIT_ERR_MSG = _("Failed to initialize network control client: %1.")
 
diff --git a/frontend/ui/widget/bboxwidget.lua b/frontend/ui/widget/bboxwidget.lua
index dd906e752..9ae1bac9b 100644
--- a/frontend/ui/widget/bboxwidget.lua
+++ b/frontend/ui/widget/bboxwidget.lua
@@ -1,14 +1,15 @@
+--[[--
+BBoxWidget shows a bbox for page cropping.
+]]
+
 local InputContainer = require("ui/widget/container/inputcontainer")
-local Geom = require("ui/geometry")
-local Event = require("ui/event")
-local UIManager = require("ui/uimanager")
 local Device = require("device")
+local Event = require("ui/event")
+local Geom = require("ui/geometry")
 local GestureRange = require("ui/gesturerange")
 local Math = require("optmath")
+local UIManager = require("ui/uimanager")
 
---[[
-BBoxWidget shows a bbox for page cropping
-]]
 local BBoxWidget = InputContainer:new{
     page_bbox = nil,
     screen_bbox = nil,
diff --git a/frontend/ui/widget/infomessage.lua b/frontend/ui/widget/infomessage.lua
index 4e9ae23eb..554a50e3d 100644
--- a/frontend/ui/widget/infomessage.lua
+++ b/frontend/ui/widget/infomessage.lua
@@ -1,7 +1,7 @@
 --[[--
-Widget that displays an informational message
+Widget that displays an informational message.
 
-it vanishes on key press or after a given timeout
+It vanishes on key press or after a given timeout.
 
 Example:
     local UIManager = require("ui/uimanager")
diff --git a/frontend/ui/widget/linewidget.lua b/frontend/ui/widget/linewidget.lua
index be2fa08e3..3534e9c8b 100644
--- a/frontend/ui/widget/linewidget.lua
+++ b/frontend/ui/widget/linewidget.lua
@@ -1,5 +1,9 @@
-local Widget = require("ui/widget/widget")
+--[[--
+Widget that displays a line.
+]]
+
 local Blitbuffer = require("ffi/blitbuffer")
+local Widget = require("ui/widget/widget")
 
 local LineWidget = Widget:new{
     style = "solid",