Update package additions/cleanup/formatting