optimized more code