Performance optimizations
Small syntax fix