Added underscores best practices