Refactored upload song controller again