Refactored structure. Clean up.