Small aesthetics + malloc error checking
Checkpoint