Updated keywords and formatting