BLK-198 Addressing my own review comments
BLK-198 Some PEP8 and cleanup