#40 Clean up keywords