added more style specs and reorganized a bit