Minor updates to clean up template and resume