Tested code formatting. Looks pretty nice and linter is almost happy too