pepe8ed and various fix