Cleaned up the template and done