Add prettier + code fixes + refactoring #15

Closed thabti closed 7 years ago