code was cleaned up