Cleaning up lint hints