#JC-1380: Finished optimization:
*Tests and documentation written
*Small refactoring performed
*Removed old approach