WIP -- cleaning styles