Make code style consistent
Undo changes to notice