Refactored with short tags