big fix style code