Cleaned up playlist manipulation