making LVS dropdown work and some code style cleanup