fixes
fix and adopt to no format