Formatting and minor fix to grabbing definitions from the file.