Vibrancy & some code cleanup