Style checks and improved configuration