Style issue fixes