manual lint fixes plus cleanup