Moved unpackCall to utils
Whitespace fixes