Add correct code style, remove unnecessary rules