[PR] Remove duplicate sidebar declaration

Also sneaks in some code standard changes.