Cleaned out some unnecessary malloc'ing