Updated for style and consistency