lint/cleanup