refactor logic a little when no sep or end is passed
1 file changed