Formatting and added authentication import