Fix notice, format code style