No more callocs. Also fixed some whitespace.