Fix to follow standards