Fixed BAP styles
Style fixes