cleanup, keyword fix