Cleaning styles, added wrappers