Removed some tabs to make style police happy