style performance improvements and readability