White noise: formatting, some missing final, etc
More white noise: format, final and some TODO