Formatting and licenses cleanup