Align malloc size and minor readablity improvement