Changed to fix minor formatting issues before checking the data types