Refactored songs controller