Minor cosmetic changes and prepared for js testing