Lots of updates, checking code format