Check Style fixes