Package design cleanup

by Angie Herrera