More styling

Signed-off-by: Huu Khiem <TongHuuKhiem@gmail.com>
Better design

Signed-off-by: Huu Khiem <TongHuuKhiem@gmail.com>