minor padding adn size adjustments
remove repeated parts of the object