Fixes: === > ==, ; where needed, remove extra refrence and some lint cosmetics