Refactored code. (cherry picked from commit f57e84b)
Refactored code.
(cherry picked from commit f57e84b)

cdowdy/bolt,romulo1984/bolt,cdowdy/bolt,Intendit/bolt,bolt/bolt,romulo1984/bolt,joshuan/bolt,romulo1984/bolt,nikgo/bolt,GawainLynch/bolt,electrolinux/bolt,rarila/bolt,bolt/bolt,GawainLynch/bolt,Intendit/bolt,HonzaMikula/masivnipostele,lenvanessen/bolt,rarila/bolt,nikgo/bolt,HonzaMikula/masivnipostele,lenvanessen/bolt,joshuan/bolt,romulo1984/bolt,HonzaMikula/masivnipostele,rarila/bolt,nikgo/bolt,GawainLynch/bolt,joshuan/bolt,cdowdy/bolt,nikgo/bolt,electrolinux/bolt,electrolinux/bolt,bolt/bolt,rarila/bolt,Intendit/bolt,cdowdy/bolt,GawainLynch/bolt,electrolinux/bolt,lenvanessen/bolt,bolt/bolt,HonzaMikula/masivnipostele,lenvanessen/bolt,Intendit/bolt,joshuan/bolt