Cleaned up style warnings