tidy + performance optimistaitons