Removed and changed things for my tastes