Code cleanup in the morning :)

also fixed the minimal
Code cleanup in the morning :)

also fixed the minimal