better performance and coding standards