Code now follows C89 standart stricter