Attempted to implement Santhosh's recommended changes.

Signed-off-by: SturmB <sturm359@gmail.com>