cleaning up some stuff, !.is_empty() is better than .len() > 0