Cleaned up code structure (cosmetics only).