Cleanup code and add more keywords