Some improvements :bust_in_silhouette: