Cleaned up template and added more notes