Fix indentations and update emails

Signed-off-by: Suriyan Ramasami <suriyan.r@gmail.com>