Refactored song input