Fix css functions + clean