cleanup and lint test