Reworked keyword list and formatting