style fix and fixing schema