restructured and refactored statements