general: refactor code to meet 80-character per line

Signed-off-by: Alex Hung <alex.hung@canonical.com>