Clean up code and provide overwrite argument