Minor clenaup