optimized a few things
optimized a few things