m
Bot style and fixes here and there
Same for MVC impl