Bump copyright year; Indentation fixes