refactoring

+ code indentation
+ shorthand without blocks
+ constructor optimizations