Forgot to return the last_modified timestamp, and some cleanup