Fix spacing and property assignment sequence

No need for crazy spacing and property assignment is from shortest to longest.

Signed-off-by: Dries Vints <dries.vints@gmail.com>