better formatting
final touch 1