Cleanups
Added performance improvments