Formatting and removed test