Modernize the source a bit