Cleaning up Template