add reserved word feature and cleanup code