Stop using slow normest1() method
Fix formatting