cleaned up portability section