Formt adjusting
large refactering : )