Use of space macros and basename controversy
Moved parent parsing code to raw data function
Pointer asterisk swap
Whitespace reorganisation