simplfy and reorganize styles