Fixed VirtualList and reformatted code