Tweaked the compact lists
Code cleaning