Celanup code, divide to universal and GCC specific