Simplify and reorganize guidelines