style: CS and be more strict about some rules