Make src more vanilla