Code cleanup and trivial fix

1. Keep 8-char-indent coding style
2. Remove unnecessary empty lines
3. Add missing header file

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>