Issue-141 Code Cleanup