Pylint fixes and other cosmetic changes

Signed-off-by: Harshavardhana <harsha@harshavardhana.net>