More efficient memory usage and
Cosmetic changes on public API