Internal improvements

Internal improvements and optimizations.