Code consistency, widget prep :shipit:
Code cleanup :rose: