Develop - JS clean up and merged anams code