Issue-3: conforming to style guides and fixing a minor NPE I'm experiencing