Style cleanup :lipstick: