alvivar Revision and clean up